<html>
<head><meta charset="utf-8"><title>conflict resolution · t-cargo/PubGrub · Zulip Chat Archive</title></head>
<h2>Stream: <a href="https://rust-lang.github.io/zulip_archive/stream/260232-t-cargo/PubGrub/index.html">t-cargo/PubGrub</a></h2>
<h3>Topic: <a href="https://rust-lang.github.io/zulip_archive/stream/260232-t-cargo/PubGrub/topic/conflict.20resolution.html">conflict resolution</a></h3>

<hr>

<base href="https://rust-lang.zulipchat.com">

<head><link href="https://rust-lang.github.io/zulip_archive/style.css" rel="stylesheet"></head>

<a name="229575715"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/260232-t-cargo/PubGrub/topic/conflict%20resolution/near/229575715" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Matthieu Pizenberg <a href="https://rust-lang.github.io/zulip_archive/stream/260232-t-cargo/PubGrub/topic/conflict.20resolution.html#229575715">(Mar 09 2021 at 23:32)</a>:</h4>
<p><a href="/user_uploads/4715/STYeK5GB3rKXqtoWKnpEsTEh/image.png">image.png</a> <br>
I love a negative diff :)</p>
<div class="message_inline_image"><a href="/user_uploads/4715/STYeK5GB3rKXqtoWKnpEsTEh/image.png" title="image.png"><img src="/user_uploads/4715/STYeK5GB3rKXqtoWKnpEsTEh/image.png"></a></div>



<a name="229575967"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/260232-t-cargo/PubGrub/topic/conflict%20resolution/near/229575967" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Matthieu Pizenberg <a href="https://rust-lang.github.io/zulip_archive/stream/260232-t-cargo/PubGrub/topic/conflict.20resolution.html#229575967">(Mar 09 2021 at 23:34)</a>:</h4>
<p>I will be without a computer until at least next week so I won't review it soon though. probably during next week or weekend. Sorry about that</p>



<a name="229576301"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/260232-t-cargo/PubGrub/topic/conflict%20resolution/near/229576301" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Eh2406 <a href="https://rust-lang.github.io/zulip_archive/stream/260232-t-cargo/PubGrub/topic/conflict.20resolution.html#229576301">(Mar 09 2021 at 23:36)</a>:</h4>
<p>No rush, I just wanted to make sure that the useful part of those design experiments got saved. And weren't trapped on that computer</p>



<hr><p>Last updated: Aug 07 2021 at 22:04 UTC</p>
</html>